Merge "Fix drawing artifacts on glowing navigation buttons."