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

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

Change-Id: Ice188522985978023ee1836cbc238303c88bd9c6