Merge "Checks cross user permission before handling intent" into tm-dev