Merge "Suppress location information for non-active users." into jb-mr1-dev