Merge "restore app favorites and screens" into jb-ub-now-kermit