Merge "Clear mIgnoreDirtyState after draw"