timob-15755: fix 'return' event on Jelly Bean
Merge pull request #5041 from hieupham007/timob-15755-3_2_X

timob-15755: fix 'return' event on Jelly Bean