Merge "SF: add vsync id to onMessageReceived trace" into sc-dev