am 7804f9e5: am fdc5e52e: Merge "Simplification of app initialization" into jb-ub-mail-ur9

* commit '7804f9e598d1069d19dcd63a839f71ea297f0a46':
  Simplification of app initialization