Merge "Don't clear the dirty clip flag if it's not applied Bug #6833979"