Merge "Don't allow Guest user to bypass permission check" into tm-mainline-prod