Merge "Fixing radius of notification focus overlay" into main