* commit '1d340a3c24913d8750900355cd92ef5742eea11f': DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
* commit '1d340a3c24913d8750900355cd92ef5742eea11f': DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.