Merge integrate/meta-guf-distro/touchcal-conv-fix-touchcalibration-storage