Merge "Make sure TrustAgent applies trust if granted before it is bound."