Merge "migration user setting to VM notificationchannel" into oc-dev