Merge changes from topic "am-7ca791b4772f4639a0195cfb90ffec7c"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Split BackEvent into an internal BackMotionEvent and public BackEvent." into tm-qpr-dev am: 8165fae2c8 am: ff5dca5ea0 -s ours
  [automerger skipped] DO NOT MERGE Split BackEvent into an internal BackMotionEvent and public BackEvent. am: 2c2265c345 am: 3ddae35703 -s ours