Merge "Dismiss migration notification when wizard done." into mnc-dev