Merge "Fix bug 3362273 - Make overscroll glow appear within padding region"