Merge "Fix AlertDialog ignoring the provided theme" into nyc-dev