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

Change-Id: I3474b07ba1647c581bbd02772e00f6371720e3df