Merge "Enforce ComponentName belongs to caller app" into rvc-dev