Merge "Fix incorrect UI after triple-tap is disabled" into sc-v2-dev