Merge "Enable/disable flags in ShadeTouchHandler test" into main