Merge "Camera: Don't set brightness progressbar visible if not set"