Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev