Merge changes Ie34a4ac6,I78323f20,If95ab474,I3927a1fd into main

* changes:
  Fix status bar icon size when shade goes around
  Fix statusbar visibility wrt shade expansion in multiple displays
  Propagate new shade displayId only after display change succeeded
  Make SysUiState for external display an override of the default one