Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev am: dc23c5e809
am: 0a5d096384

Change-Id: I595e06692d61a4f8961254d6a2bddc5cc17b082a