Merge "Do not allow setting notification access across users." into tm-dev