Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev