Merge "Revert "Using SecureTouchListener for install button during install confirmation"" into oc-dev