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