Merge "Avoid flushing DisplayListCanvas state for noop calls" into mnc-dev