[FIX] ItemNavigation in table mode - endless recursion

Change-Id: I9fe16c608e92f2367a73653700a27c273daae066
CSS: 1482001742
Merge "[FIX] ItemNavigation in table mode - endless recursion"