Merge "Added a timeout to the launch animation"