Merge "Merge "Prevent NPE whlie leaving windowless dream service." into rvc-dev am: 3944050a am: 2a0437f8" into rvc-d1-dev-plus-aosp