Merge "Treat dimming-disabled layers as HDR" into tm-dev