Merge "Trust agents can show a message to the user on grant"