Merge "Made dialog material design compliant"