Simplify the quickList option to ULS

Change-Id: I4ae266d51be4be2b39b9bd35cdd12c8e4ab04284
Merge "Simplify the quickList option to ULS"