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

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