Merge "Patched <1 resolution bug in reference VHAL" into main