Merge "Move capturing entering views until just before transition." into lmp-dev