Merge "Remove callback to invalidate menu if necessary" into nyc-mr1-dev