Merge "Camera: Add support for settings Override"