Merge "Camera: Set inverse display transform if needed" into pi-dev