Merge "Compatibilize with flickerlib changes" into main