Merge change I54089080 into eclair

* changes:
  Update keyguard and pattern-lock layouts for new UX designs.