Merge "Fix ServiceConnectionLeak in network fragment"