Merge "Make DropRootUser more container-friendly" into pi-dev