Merge "Don't call updateDisplayListIfDirty outside draw." into mnc-dev