Merge "Restrict screen saver settings searches to enabled users." into udc-dev