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

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