am c71f3a2d: am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev

* commit 'c71f3a2d4a3b3ab52be08e68646ffcb71b55066a':
  Show correct locked orientation on phones