Merge "Fixing issue with exit animation due to incorrect visibility state."