Merge "SF: Fix TrustedPresentationListener npe"