Merge "Add public API for on screen zoom controls" into honeycomb