Merge "Disable blurs during critical thermal state" into sc-dev