Merge "Fix the frame sync issue in COMBINED_UPDATE_RENDER mode" into devel/master