am eed8411c: Merge "Bootstrap installed system apps only when the target user is running" into jb-mr2-dev

* commit 'eed8411c8cc1f163ba06a928e3b4b6d3f1045282':
  Bootstrap installed system apps only when the target user is running