@BRadSmith: I share your frustration, but here's what I do to get the Lock/Unlock to stick:
in Develop tap R, tap the padlock to switch to the mode you want, tap R again. The mode is now stuck. The next image you open will maintain the mode you set.
Works 100% for me, hope it works for you too.