Merge "Ensure we always reset graphics modifiers Bug #6025838"