Merge "Fix an IllegalStateException in dream overlays." into tm-dev