Merge "Explicitly detach from wallpaper service when disconnecting" into sc-dev