Merge "HighHint touch boost fix re. frame rate override" into main