Merge "Fix notification message when moving." into nyc-dev