Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev