Merge commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da' * commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da': Fix 2105956: The nine patch markers for one of the zoom buttons were reversed
Merge commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da' * commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da': Fix 2105956: The nine patch markers for one of the zoom buttons were reversed