Merge "Rearrange code in User::getBlockedStatus to avoid isAllowed calls"