New app layout currently enforces this, so unbreak it there Change-Id: I8885c18d839d715b4308a4abd9634a1130da13e2