Fix GeneralUI FC when navbar is enabled

Leftovers from patch merging

Change-Id: Id154afb777eb1eadbbef9e4b73456ecb01b2126e