Merge "Update the style of navigation button" into rvc-dev