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