Merge "Fix zoom overview logic."