Keep armature in pose mode

When switching a model from weight paint mode to object mode, the armature automatically switches to object mode as well. Which means that in order to move bones, or to switch back to weight paint mode, the armature has to be switched back to pose mode, selected, shift select the model, then back to weight paint or edit mode. This is inconvenient. It would be good to leave the armature in pose mode, as it was in earlier Blender versions. Or to have a toggle somewhere in preferences to allow keeping the armature in pose mode.