Merge "Fix to further ensure floating menu is refreshed on user change" into main