Merge "Prevent NPE whlie leaving windowless dream service." into rvc-dev