Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce