Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev