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

* commit '2fc6e2b57ddfac58ce1fbded6f8a64a0b2fc9d70':
  Show correct locked orientation on phones