Merge "Restore HUN appear animations in shade" into main