Merge "Prevent NPE whlie leaving windowless dream service." into rvc-dev am: 3944050a am: 2a0437f8 Change-Id: I2394f9ae4b4e55bb78122f9043238420e7895a55