Merge "Fix disabled views with nearest touch frame" into oc-mr1-dev