Merge "Fix long-standing bug with LockPatternView drawing artifacts" into jb-mr2-dev