Merge "Fix SurfaceFlinger_test failed when display color mode changed"