Portrait only try.
[ci skip]
Merge branch 'develop' into portrait-only