Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev