Merge "Remove duplicate definition of assistant screen type" into oc-dev