Merge "Restore overlay support for RGB565 layers" into klp-dev