Merge "Clean up postWindowRemoveStartingWindowCleanUp" into udc-dev