Rename Cancel button to Close and make Close save settings

Change-Id: I0b0b9e4123a57ce135e6018cb1c24065659ac763