Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev