fix fc if the navbar icon is null

Change-Id: I49da40617ad9b1c054e5cb8e474772927724f73d
Merge "fix fc if the navbar icon is null" into jb42