Merge "Copy leashes about to return to prevent others release them" into rvc-dev am: d4ec66b4f3

Change-Id: Ic6ce627c475c34a7bb90beb61579144c851fd0dc