Merge "Fix a regression where android:windowContentOverlay did not draw properly."