Merge commit '7d8a2c39cba15bced65acabc88344d6313bd09db' * commit '7d8a2c39cba15bced65acabc88344d6313bd09db': Adjust 'account unlock' scenario to make 'forgot pattern' more forgiving.