Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev