Merge "Camera2: add metadata override" into klp-dev