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

* commit '3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
  Show correct locked orientation on phones