Merge "Updated layouts for new status bar"