Merge "Hide manage menu in overflow" into rvc-dev