Merge "Add thermal options for refresh rate blocking zones." into udc-qpr-dev