Merge "Avoid improperly removing views during transitions"