Merge changes I9f8bcf71,Iea091bb0 into main

* changes:
  Baseline PM flags and UserInfo for SysUI.
  Misc baseline support for SysUI.