Previous code change 2018643002 (for user menu redesign) modified code on the spot and did not put the changes behind any flag. This CL is to:
1. add flags for the previous code change;
2. add back some of the deleted resources as they will still be used when the flag is not turned on.

BUG=615893

Review-Url: https://codereview.chromium.org/2034093003
Cr-Commit-Position: refs/heads/master@{#398184}