Merge "Keep scrim when info dialog on" into main