Merge "Provide isLocked to wallet instead of isUnlocked" into rvc-dev