Merge "Avoid onServiceDisconnected() for unbind Service"