Merge "Fix dialog overlay theme background color, add theme attr"