Merge "Fix the string typo for app_streaming role" into tm-dev