Merge "Camera: derive post RAW sensitivity keys for BC" into nyc-dev