Merge "Fix disabled state of CallStyle buttons to make them look/act disabled" into tm-qpr-dev