Merge "Add auto-white balance locking to the Camera API."