Merge "Remove icon from base alert dialog, use light theme"