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