Merge "Fix modes tile tap target" into main