Merge "Consolidate common zoom code and tighten access to some ZoomManager variables."