Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev