Merge "Better support portrait mode for foldables" into tm-qpr-dev