am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev

* commit '95d520f160db65f90da56610eee1a047fb60fc4e':
  Fix NPE in moveSharedElementsToOverlay