Merge "Fix the starting window could not be removed." into rvc-dev am: 3443ba8dc9 am: cb22ae7775

Change-Id: Id471c4c5af5467c67d81eaca157d64767a680886