Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev