Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev