Merge "Fix 5044158: Fix landscape PIN layout issue"