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