Merge "Fix alpha keyboard shortcuts with ToolbarActionBar" into lmp-mr1-ub-dev