Merge "Fix metro clock changes to wrong clock after previewing while using shared lottie assets" into main