Merge "Fix wrong screenId when committing emptyScreens" into sc-v2-dev