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

* commit 'fdc5e52ef99e23260cd136d946fa78cdeab6da21':
  Simplification of app initialization