Merge "Stop showing disclosure UI when isDisclosureEnabled is false."