Merge "Fix race condition wen setting boot color sysprops (round 2)" into sc-qpr1-dev