Merge "Use current preference overriding for live preview"