Merge "Reparent status bar icons into header when expanded."