am af2f8cda: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev

* commit 'af2f8cda5f950b7685892398e38f0ef270faf831':
  Fix NPE when shared element listener is null.