Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev