Merge "Revert "Check cross-user interactions for permissions and app-op...""