Merge "Fix disabled views with nearest touch frame" into oc-mr1-dev
am: 2602127d55

Change-Id: Ib9be53d33e716bdde0895093c272892cb2562d59