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

Change-Id: Ib2f846b0ca309f0995ce19ed2b1e8ac7ff76e5dc