Merge "Fix toolbar keyboard navigation and touch." into 24D1-dev