The change adds the view cookies for the menus rendered in the action bar. This enables the IDE to map the menu to the relevant XML Tag in the menu xml and show the highlighting accordingly. The change also contains a bugfix where a method wasn't renamed properly. Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca (cherry-picked from commit 1001961f904bac5294aaf73a47c2497aa764bf7f)