Merge "Fixing deadlock when surface creation is waiting on surface destroy" into sc-dev