RFE-1426: Navigation state lost on reload + Bugfix-4439

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>