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

* commit '9649c3ebbe08e310bdc42dbfce48b64d7246a202':
  Save app toggle state as soon as possible