Merge "Fix truncated text in pattern lock setup" into nyc-dev