Fix #1587 Make intent/bundle/saved/tags instance keys consistent

[janewaitara]

Explanation

Fixes #1587 Made intent/bundle/saved/tags instance keys consistent

Checklist

• The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
• The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
• The PR follows the style guide.
• The PR does not contain any unnecessary auto-generated code from Android Studio.
• The PR is made from a branch that's not called "develop".
• The PR is made from a branch that is up-to-date with "develop".
• The PR's branch is based on "develop" and not on any other branch.
• The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

[janewaitara]

@rt4914, PTAL

[rt4914]

@janewaitara Couple of issues with this PR:

1. This PR shows changes in 73 files. Ideally a PR should consist of changes in less than 15 files. Otherwise it become really hard to review PRs.
2. You have not changed keys in test related files because of which tests are failing.
3. The formatting of the code is incorrect and because of which your lint checks are also failing.

Suggestion

I suggest that you approach this issues in multiple PRs. So for example in first PR you can target changes only in keys which are mentioned in AdministratorControlsActivity and as a result of that change there will be various files which will get affected too and you can fix them too and therefore you PR will get done for that particular activity in less than 15 files.
This way reviewing PR will become vary easy and they will merge fast too.

Thanks a lot.