Merge "Use string resources instead of literals for backup password confirmations" into jb-dev