Merge "Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev