Merge "[sf] Fix layer ids for background color layers" into udc-dev