Merge "Remove callback to invalidate menu if necessary" into nyc-mr1-dev am: 9d3619646d am: 202fbf0ac1
am: 5976e06a2c

Change-Id: I94e2c1cd46e83b986ec92af85dceaefe47e5995c