Merge "Fix Clear Credentials item" into jb-mr2-dev