Merge "Fix exit transitions hiding views permanently." into lmp-dev