Fixes issue with topcontrol during navigation

Change-Id: I723003e9c3709c0c44911492583f94cb956dba91
1 file changed