Merge "When updating background colors in the shade, be sure to apply the reset to child rows." into tm-qpr-dev
