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

Change-Id: I8dfe81ce7a7d38e64ea308881e3ade7fac5d777c