Merge "Update legacy nav bar background on visibility change" into main