Merge "Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844 am: 0592820f am: f238735a" into tm-qpr-dev-plus-aosp