Merge "Fix keyboard navigation work in Settings home page" into rvc-dev