Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev automerge: 7ce662e -s ours
automerge: b1a0a57 -s ours
* commit 'b1a0a57ccab94e479087b620dcea2b39225693bb':
DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
This commit is contained in: