Merge changes from topic "am-488200cdf78743a7bf63c3e098588cff" into main

* changes:
  [automerger skipped] Merge "Update screenshot shelf UI flag name" into 24D1-dev am: 8ea2570ff3 -s ours
  [automerger skipped] Update screenshot shelf UI flag name am: 66f74de322 -s ours