Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev