am 541ff5d: Merge change 1566 into donut

Merge commit '541ff5df00984580e0245b3ae2c89b93e76b7c08'

* commit '541ff5df00984580e0245b3ae2c89b93e76b7c08':
  Fix issue #1838944: Application sync settings cant be changed with auto sync on