Merge "Disabling transition animation when view has size=0"