Merge changes from topic "am-bd14a5ba550a411d8df406188cd0cd93"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Let BackProgressAnimator could play cancel animation" into tm-qpr-dev am: 72426cc2eb am: 532e02d286 -s ours
  [automerger skipped] DO NOT MERGE Let BackProgressAnimator could play cancel animation am: 056a4fcdc7 am: d610ac68fe -s ours