Merge changes from topic "am-990e4dfbb9e245af98125aa5aa908315"

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into qt-dev am: b968a16d am: 2a84aae3 -s ours am: 4e7a7d3c am: a26090c1 am: 7a45c448 am: 158d28a8 -s ours
  [automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: f4eefc55 am: 4cccd0c4 -s ours am: 67bd3cae am: 2170554e am: 6fcec5e8 am: 7bf79464 -s ours