Merge "Remove '?' icon in layout for "Forgot pattern" button" into klp-dev