Also don't update the focus tracking redundantly. Fixes bug 3076468 Change-Id: I021e1bb91134d5226735d9510ad7f9a7b650f93f