Merge "Fix races in GHBM surface creation and usage" into sc-dev