Merge "Update ModesTile state even when arg == null" into main