Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev