Merge "Add action mode decor to layout.screen_simple"