Merge changes I69e9cbb6,I187b5a56 into sc-v2-dev

* changes:
  Prevent the occlusion state mismatch between WM and SystemUI.
  Remove keyguard candidate.