Merge "Don't use two different variables to refer to mSnapshot."