Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev