Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev