Merge "Stop WPMS from trying to rebind to a disconnected wallpaper service" into main