Merge "Keeping sp<IBinder> around in ClientCache"