Merge "Separate background & pointer alpha for the expanded view" into main