Merge changes Ida1ee588,Ib5a356ad into main

* changes:
  Fix misc issues for transition to hub when turning screen on
  Fix glanceable hub not showing when waking from doze