Merge "Fixing leaks in WindowMagnificationControllerTest"