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