Merge "Return canned messages from getDisabledMessage for..."