Merge "Compatibilize with changes in flickerlib" into main