Merge "Add primary menuitems" into rvc-qpr-dev