Merge "Add landscape layouts for keyguard sim pin and puk" into main