Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev