Merge "Fix issue #7272775: Auto Start Apps Not Starting" into jb-mr1-dev