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

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