Merge "Some fixes to TrustedPresentationListener"