Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev