Merge "Improve PIA dim causing UI flash" into main