Merge "Merge "Merge "Remove duplicated onBackStackChanged() call." into oc-dev am: c110c5ed" into oc-dev-plus-aosp am: a4c63e0f"