Merge changes from topic "am-1ce5297c2b304531b55f93301c508cf5"

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Force input window updates when layer visibility changes" into tm-qpr-dev am: 34cf3256 am: 6ff6d6cc -s ours am: cf42e188 -s ours am: 294c38d3 -s ours
  [automerger skipped] DO NOT MERGE: Force input window updates when layer visibility changes am: 243e2e9a am: e80b9572 -s ours am: 6f2438a7 -s ours am: e06f7892 -s ours