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

* commit '91aa6021876e1690ad84ca0b3304ca7b0f925e80':
  Add a scrubber to keyguard; layout tweaks