Merge "BBQ: Update the transform hint if the SC layer handle does not change" into sc-dev