Merge "Refactor zoom overview width calculation."