Fixed the image basemap jitter.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	third-party/SMCalloutView