Merge "Move OnBackInvoked to BaseActivity." into tm-qpr-dev