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

Change-Id: Iadf156c9c4904234c50f9b97c9cea71bb2cd6e43