Merge "Fixed issue when hotseat icons are not touchable" into main