Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev