Merge "Fix a bug in navup button."