Merge "fix default-Paint-flags-related CTS breaks"