Merge "Fix potential ASurfaceTransactionCallback leaks" into sc-dev