Merge "Apply WindowAttributes for overlay container" into main