Merge "Fix issue with auto-adding work tile" into main