Merge "Fix tuner sub-screens attach" into oc-dev