Allow underscores as well as spaces in incategory:

Bug: 58579
Change-Id: Ie7f83db84527d58fcc7ce486f0dced69529c9322