Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev