Merge "Disable requestVisibleBehind." into oc-dev