fix fc if the navbar icon is null

Patch Set 2: Added an icon to return if the old one is null

Change-Id: I4ff60e6da624f482518fb065227bd356dd97d5f1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1