Revert "Remove redundant focus handler"

This reverts commit 739d952a819ca44e5e414c40e927c2d7f67fe89d.
Bug: 48703

Change-Id: Ib66ed3c824f0bd5e68258eb5a39b8affc8b50e9f