Merge "Camera: Update external camera orientation guidelines" into pi-dev