Merge "Fix layout for decryption password entry." into jb-mr1-dev