Merge "Change move storage from dropdown pref to dialog" into mnc-dev