Merge "Fix alert dialog's background when no custom panel visible"