Merge "Fix KQS app launch through tapping" into main