Merge "Remove clickable from tiles that cannot be clicked" into main