Merge "Make bootstat container-friendly" into pi-dev