Merge "Add flag to disable hiding complications on touch" into main