Merge "Revert "Use the content width to calculate the zoom overview"" into froyo