Merge "Waiting for Normal state after dismissing Home AllApps by touching outside" into main