Photoshop CC 2017.1.0: Tool shortcuts often resetting to default tool (e.g. "b" key resets pencil tool to brush tool) when switching tools

After updating to Photoshop CC 2017.1.0, I'm encountering an issue when switching between tools using keyboard shortcuts.  Instead of Photoshop remembering my previously selected tool (e.g. pencil tool), switching back will give me the default tool for a given shortcut key (brush instead of pencil).

How to reproduce this issue:

Start out by drawing with the pencil tool, press "v" to switch to the move tool, and then press "b" again to switch back to the pencil tool. I get the brush tool instead of getting my previously-selected pencil tool.  Same thing happens if you select the Elliptical Marquee Tool, then press "v" to switch to the move tool, then press "m" to switch back to the Elliptical Marquee Tool -- you get the default Rectangular Marquee tool instead.  This didn't happen for me in the previous version of Photoshop, and it's making it difficult to take advantage of shortcut keys.

Seems similar to this issue from 2015:

https://feedback.photoshop.com/photoshop_family/topics/photoshop-cc-2015-1-1-tool-shortcuts-resettin...