Merge default preferences updates from 3.3.1