merge -r691892 (fix NPE when clicking next & previous icon of bytecode search results) from 1.1.x branch