Right now Avatar isn't mature enough for keyboard navigation so it's best to work around touch issue for now (cherry picked from commit 62a70dbc)