Merge "DO NOT MERGE Fix divider animation from overview screen" into sc-v2-dev