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

Change-Id: I4b34f7ad323f3893b116616105aaf4291baeae1e