Prevent focusing disabled toolbar buttons

Change-Id: Iada2b49530833c26493e22e41cdc465622a00e70
Merge "Prevent focusing disabled toolbar buttons"