am 310796de: am d6239b92: Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev

* commit '310796de0b86074229ad804001b1ef8d466ee69c':
  Add a scrubber to keyguard; layout tweaks