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