Merge "RESTRICT AUTOMERGE Add cross-user check to streaming policy getters" into tm-qpr-dev