Merge "Fix notification vibration demos in settings" into main