This reverts commit 6e64e0c61720244894dbd1fd6b36394adc63b2de. It introduced a null pointer crash for pinch-and-zoom. Change-Id: I886057053b4cd2aded0f58618a806f7a67e58968
This reverts commit 6e64e0c61720244894dbd1fd6b36394adc63b2de. It introduced a null pointer crash for pinch-and-zoom. Change-Id: I886057053b4cd2aded0f58618a806f7a67e58968