Merge "Aniamte stashed handle color changes" into sc-v2-dev