Merge changes from topic "am-f7dcc4c8156c49848b370ef1c05591b6"

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Hold onto occluded change until it's committed"" into tm-qpr-dev am: 27235319 am: 83097c1f -s ours am: 6ffe1437 -s ours am: bd3da911 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Revert "Hold onto occluded change until it's committed" am: 98dc3986 am: 49a253fc -s ours am: 91a6014b -s ours am: 380321f2 -s ours