Merge changes from topic "am-5c809b0f931842e5aa0800f5e2d57308" into sc-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Add generic rotary support for sysui overlay window" into rvc-qpr-dev am: 53107b6e79 am: 267b7d49d3 -s ours
  [automerger skipped] DO NOT MERGE Add generic rotary support for sysui overlay window am: e076c2344e am: baef70ab50 -s ours