Merge "Transition: remap if views in calling activity became invalid" into lmp-dev