[-1] Fix flicker of -1 when swipe up to exit -1 isn't fast enough

Fix: 381017761
Flag: NONE - released code
Test: manual - record a video
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b8b16bd2882d7752ffc46c2b55cecd22939a403e)
Merged-In: I5bda4a234cdcc8227d4feb9a92a174d07e46f7a2
Change-Id: I5bda4a234cdcc8227d4feb9a92a174d07e46f7a2