Merge "Fix leakage of ASurfaceTransactionCallback" into sc-dev