am d452d4d7: Merge "Postpone loading default favorites" into jb-dev

* commit 'd452d4d76b69438704e4ca31063f418a860a6964':
  Postpone loading default favorites