am b9da12d5: Merge "Reparent status bar icons into header when expanded."

* commit 'b9da12d5684a35126552d9736cf827369a4ebcc6':
  Reparent status bar icons into header when expanded.