Merge "Update permission checks in Permission Activity" into tm-dev