Merge "Stop offering "Replace..." when there are no suggestions." into mnc-dev