Merge "Stop showing disclosure UI when isDisclosureEnabled is false."
am: 6452cc3cc1

Change-Id: Ie616ed1e05c45a30b5ab20873fa07f963f0d3e49