Merge "Remove ConfigFlags" into pi-dev