Merge "SF: Fix duplicate callbacks from mirrored layers" into sc-v2-dev am: f2cf7639a8 am: a1fd504439

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

Change-Id: I7e0001d176358f8c21ad54ee0fed10d8fa272aa5