us87:
Locked portrait mode
Merge remote-tracking branch 'origin/s06us87' into dev