Merge changes I5286112b,Ic5701d67

* changes:
  Don't set the "incomplete" bit for empty numbers.
  Updated bottom nav to match redlines.