Merge "Improve entrance animations on convo page" into sc-dev