Merge "Refactor Photo and Video Data into seperate classes Delete unused RotationTask" into ub-camera-haleakala