Merge "Enabling portrait orientation in touchpad tutorial" into main