Merge remote-tracking branch 'origin/rtp-updates-sa4-134' into rtp-updates-sa4-134-alternative-orientation
