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

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