Merge "Do not force desktop mode on a rear positioned display" into main