Merge "Camera: Remove fwk only keys after they are used" into main