Merge changes from topic "am-629d721311684d0894cb70223e57c879"

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Bouncer - Intercept touch events when not visible" into tm-qpr-dev am: 030b7809d2 am: b2bec98532 -s ours
  [automerger skipped] [DO NOT MERGE] Bouncer - Intercept touch events when not visible am: 96cdb8a262 am: 1734b48777 -s ours