am 225f5d1c: Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev

* commit '225f5d1c69395301f9782cc38714e5ca5db5e3d5':
  Moved shared element motion to be in called Activity.