Merge "Fix touch accessibility in keyguard." into klp-dev