Merge "Notify upper layer when deactivation to discovery failed"