Merge migrate_preferences and notification UI updates from 3.3.1