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