Merge "Reuse stash handle alpha animation constants" into main