Merge "cameraserver: Fix SessionConfigurationUtils::getAppropriateModeTag" into sc-dev