Merge "Fix pointer location would be truncated by nav bar" into rvc-dev