Merge "Configure root_helper_daemon for better performance"