Merge changes I3f3f10e8,I527e401b into sc-dev

* changes:
  Fade background when keyguard user switcher open
  Use correct keyguard margin clock position algorithm