Merge "Revert "Add extra strings for 'tomorrow' text"" into pi-dev