Merge "Stop showing disclosure UI when isDisclosureEnabled is false." am: 6452cc3c am: f9e3e406 am: 2123aad7 am: df003a7b Change-Id: I463fa34afc551e61b7367525acc1a180d0d7376b