Merge "CDD: Change for camera intent handling" into rvc-dev