Merge "Remove custom targeting logic for app data isolation." into rvc-dev