Merge "Share preference controller in AdavancedAppSettings search"