Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev