Merge "[SurfaceFlinger] Disable HDR dimming when screen rotates." into tm-dev