Merge "Apply Zen Mode later, after we've found the old record." into lmp-preview-dev