Merge "Waiting a proper time to remove the snapshot starting window" into sc-dev am: 87d84d5e23 am: 490db5163d

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

Change-Id: Ie261ff7c99c47810a55f252d27f6d201caec4a95