* commit 'a6a4a9ed46d02ec0c6493a97cd1d3351bdcced63': fix a surface leak introduced by a failed merge (DO NOT MERGE)