Merge "Introduce FreeformWindowsPreferenceController"