Merge " Add leo related overlays" into gingerbread