Merge "Fix the back button ripple." into oc-dev