Merge "Make Manage Apps remember which tab was shown." into jb-dev