Merge "cameraserver: add input group" into nyc-mr1-dev