Prevent disabled tools from stealing focus

Change-Id: I096caeafb67dd9b7548fe8229e3ef325b99cabf7
Merge "Prevent disabled tools from stealing focus"