Merge "Set USER_FIXED for all non-granted permissions as long as one in the group is changed." into cw-f-dev