Merge "Prevent Keyguard quick affordance from stealing touch while in QS" into tm-qpr-dev