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

Change-Id: Ib7611306c6117754759af2b07e21f9cd26610173