Merge "Ensure Audio Sources View is 48dp" into main