Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev