Merge "Merge "Disable blurs during critical thermal state" into sc-dev am: 12740585ed am: 9d37c07767" into sc-v2-dev-plus-aosp