Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev