Merge "Extend set user protected packages for multi-user" into sc-dev