Merge "Prevent NPE whlie leaving windowless dream service." into rvc-dev am: 3944050a am: 875f6092 Change-Id: I0a1aace0c60a34025f69b626a08b8120c8143f42