Merge change I17b7ffe9

* changes:
  Do not back up / restore the END_BUTTON_BEHAVIOR setting