am 44f83413: Merge "restore app favorites and screens" into jb-ub-now-kermit

* commit '44f834133e106550a67ecf246e8bc9d4e1644c56':
  restore app favorites and screens