am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev

* commit 'f6dbd61b108e586c1db3e61cbfc07d4d750027c0':
  Always layout Keyguard on config change.