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