Merge "Fix flicker caused by disabled shared animations" into main