Merge "Fix StrictMode violation and add filter for scroll mode" into r-keystone-qcom-dev