Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev