Merge change 1566 into donut

* changes:
  Fix issue #1838944: Application sync settings cant be changed with auto sync on