Merge "Fix issue with PiP touch drift." into oc-dr1-dev
am: b544b81b53

Change-Id: Idf6f88cb33aa9ba39c67f83419b18c03ef829ed2