Merge "Rendering glitch workaround"