am aeb0a9db: am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into...
am aeb0a9db: am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev automerge: 8a536bb4
* commit 'aeb0a9db':
Fix NPE in moveSharedElementsToOverlay