Merge "Avoid global transaction in magnifier"