Merge "[Performance] Use bool var judge whether the navi-keys enabled" am: 2feca0977c
am: 97896ef4e3  -s ours

Change-Id: Ie53d23c709692f3ed528dafef93568767e529229