Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev
automerge: 7ce662e  -s ours

* commit '7ce662ef870df34cd189b4ce9e487e496ba407dd':
  DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.