Merge "Move fixed landscape in RotationHelper from a request to a variable" into main