Smart nav optimization (flicker issue)

@texasag @prabinv @hippee-lee