Merge "Load fallback categories earlier" into pi-dev