Merge commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c' * commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c': Fix secret EditText display and other fixes.
Merge commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c' * commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c': Fix secret EditText display and other fixes.