Merge "Fixed graphical glitch in lockpattern view" into main