Merge "Prevent apps from publishing system routes" into main