Merge "Simplify code for updating tooltips with accesskey tips"