Merge changes from topic "am-d9809f12a82e45e587ea2fead4e067b5"

* changes:
  [automerger skipped] Merge "Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301" into tm-dev am: a61b7c7f -s ours am: f6121d36 -s ours am: 56b02f61 -s ours am: 1af53922 -s ours
  [automerger skipped] Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301 am: 3fc6dd50 -s ours am: 5604dfbf -s ours am: 66868803 -s ours am: e096766b -s ours