Use native focus

It's faster

Change-Id: I27a7926a21dd81fec8bd398e6f4afbe05e06dd6d
Merge "Use native focus"