Merge "Revert "Improve PIA dim causing UI flash"" into main