Merge "Don't back up Smooth Display if feature flag off" into main