Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev