Merge "Remove possible residual callbacks when detach wallpaper." into rvc-qpr-dev am: 4d7f81e979

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

Change-Id: I8933aa13d62d9cfea3f91310fcb204251fe9d557