Merge "Fix latching of final buffer when moving off-screen and destroying" into sc-dev am: 2bd3639d16

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

Change-Id: I25720a5ce9c113932d58ca44a723a49157c4c7e7