am c5b03657: Merge "Save app toggle state as soon as possible" into jb-mr2-dev

* commit 'c5b036571ed2eeae73b0551848e7f7efdc016a52':
  Save app toggle state as soon as possible