Merge "Show correct locked orientation on phones" into mnc-dev