Merge "Fix race condition when setting boot color sysproprs." into sc-qpr1-dev