Merge "Migrate and convert WL settings to the new UX"