Merge "Replace Toast-based cheat sheets with tooltips"