Merge "Do not add "Switch user" action if switching users disallowed" into main