Merge "Replace "hotseat" with "Favorites tray" in user visible strings." into jb-ub-now-kermit