Merge "Don't leak input events to dumpsys on user builds" into oc-dev