Merge "Remove duplicated onBackStackChanged() call." into oc-dev