Merge landscape rotation fix for PR1.2