Merge "Adjust optimize page logging timing" into sc-v2-dev