Merge "Fix bug 3149106 - disabled text not dimmed"