Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev