Merge "Tuned the heads up animations more" into sc-dev