Merge "Simplify GlobalActionsFlatLayout and fix dismiss"