FP name shouldn't be allowed to allow/display non-null names

Fixes: 37360324
Test: try to save an empty FP name
make sure it doesn't display the empty name

Change-Id: Ie81699abc0da9513e5173364e8ae969bbe195ac6