Merge "Pass initiatedByUser to TrustListeners" into lmp-dev