Merge "Close PFD when returning via AndroidFuture" into main