Merge "Do not add starting window after the starting data was cleared." into sc-dev am: 6397a19e am: 577ceeba

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13877248

Change-Id: I060c163892ca812de17ed1b4ff2c1171c3bd821d