Merge "Revert "Changes to support complete disabling of Burst."" into ub-camera-haleakala