Merge "Watch for profile changes and push to user manager" into jb-mr1-dev