Merge "Map the new category keys to the corresponding fragment." into pi-dev