fb: cleanup and let the navring stay and not

dimiss on targetchange....user seems to like it more
this way.

- This commit also reverts 6a316833b96da92983e28b9a192533b697bab34b

Change-Id: I73b36ef7a09dc08615fef522a8913a53b27b4763