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