Merge changes I76ea8651,I76a84b4f into sc-v2-dev

* changes:
  Fixing keyguard user switcher height after collapsing
  Accounting for user switcher on split shade lock screen