proper fix for navbar color glitch

Change-Id: I4c8225cdc0705ecc7003ea775f0e95821320d8d4