Merge "Fixed issue with shadow for overflow icon" into main